Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[#591] Remove unnecessary tezos-client deps #680

Merged
merged 1 commit into from
Sep 6, 2023
Merged

[#591] Remove unnecessary tezos-client deps #680

merged 1 commit into from
Sep 6, 2023

Conversation

PruStephan
Copy link
Contributor

@PruStephan PruStephan commented Jul 19, 2023 •
edited
Loading

Description

This MR removes unnecessary dependency of libffi from tezos-client build. This seems to be the only dependency that is unnecessary, as without others brew fails to build it.

Related issue(s)

Closes: #591

Related changes (conditional)

  • I checked whether I should update the README

  • I checked whether native packaging works, i.e. native binary packages
    can be successfully built.

Stylistic guide (mandatory)

@PruStephan PruStephan force-pushed the PruStephan/Remove_unnecessary_tezos_client_deps branch 6 times, most recently from 7a8eabf to b29f9cd Compare July 21, 2023 14:38
@PruStephan PruStephan force-pushed the PruStephan/Remove_unnecessary_tezos_client_deps branch 5 times, most recently from 0e00525 to 2231052 Compare August 2, 2023 08:40
@PruStephan PruStephan self-assigned this Aug 2, 2023
@PruStephan PruStephan force-pushed the PruStephan/Remove_unnecessary_tezos_client_deps branch 9 times, most recently from 779aaea to 10ad464 Compare August 11, 2023 10:01
@PruStephan
Copy link
Contributor Author

Seems that only binary that requires fixing is tezos-client.
Result of using otool:

|tezos-client-----------------------------------|
/usr/local/bin/tezos-client:
	/System/Library/Frameworks/Security.framework/Versions/A/Security (compatibility version 1.0.0, current version 59754.100.106)
	/usr/lib/libSystem.B.dylib (compatibility version 1.0.0, current version 1292.100.5)
	/usr/local/opt/hidapi/lib/libhidapi.0.dylib (compatibility version 0.0.0, current version 0.14.0)
	/usr/lib/libc++.1.dylib (compatibility version 1.0.0, current version 905.6.0)
	/usr/local/opt/gmp/lib/libgmpxx.4.dylib (compatibility version 11.0.0, current version 11.1.0)
	/usr/local/opt/gmp/lib/libgmp.10.dylib (compatibility version 15.0.0, current version 15.1.0)
	/usr/local/opt/libev/lib/libev.4.dylib (compatibility version 5.0.0, current version 5.0.0)
gmp
hidapi
libev
tezos-sapling-params

|tezos-admin-client-----------------------------------|
/usr/local/bin/tezos-admin-client:
	/System/Library/Frameworks/Security.framework/Versions/A/Security (compatibility version 1.0.0, current version 59754.100.106)
	/usr/lib/libSystem.B.dylib (compatibility version 1.0.0, current version 1292.100.5)
	/usr/local/opt/hidapi/lib/libhidapi.0.dylib (compatibility version 0.0.0, current version 0.14.0)
	/usr/lib/libc++.1.dylib (compatibility version 1.0.0, current version 905.6.0)
	/usr/local/opt/gmp/lib/libgmpxx.4.dylib (compatibility version 11.0.0, current version 11.1.0)
	/usr/local/opt/gmp/lib/libgmp.10.dylib (compatibility version 15.0.0, current version 15.1.0)
	/usr/local/opt/libev/lib/libev.4.dylib (compatibility version 5.0.0, current version 5.0.0)
gmp
hidapi
libev
libffi

|tezos-node-----------------------------------|
/usr/local/bin/tezos-node:
	/System/Library/Frameworks/Security.framework/Versions/A/Security (compatibility version 1.0.0, current version 59754.100.106)
	/usr/lib/libSystem.B.dylib (compatibility version 1.0.0, current version 1292.100.5)
	/usr/lib/libz.1.dylib (compatibility version 1.0.0, current version 1.2.11)
	/usr/lib/libc++.1.dylib (compatibility version 1.0.0, current version 905.6.0)
	/usr/local/opt/gmp/lib/libgmpxx.4.dylib (compatibility version 11.0.0, current version 11.1.0)
	/usr/local/opt/gmp/lib/libgmp.10.dylib (compatibility version 15.0.0, current version 15.1.0)
	/usr/local/opt/libev/lib/libev.4.dylib (compatibility version 5.0.0, current version 5.0.0)
gmp
hidapi
libev
libffi
tezos-sapling-params

|tezos-signer-----------------------------------|
/usr/local/bin/tezos-signer:
	/System/Library/Frameworks/Security.framework/Versions/A/Security (compatibility version 1.0.0, current version 59754.100.106)
	/usr/lib/libSystem.B.dylib (compatibility version 1.0.0, current version 1292.100.5)
	/usr/local/opt/hidapi/lib/libhidapi.0.dylib (compatibility version 0.0.0, current version 0.14.0)
	/usr/lib/libc++.1.dylib (compatibility version 1.0.0, current version 905.6.0)
	/usr/local/opt/gmp/lib/libgmpxx.4.dylib (compatibility version 11.0.0, current version 11.1.0)
	/usr/local/opt/gmp/lib/libgmp.10.dylib (compatibility version 15.0.0, current version 15.1.0)
	/usr/local/opt/libev/lib/libev.4.dylib (compatibility version 5.0.0, current version 5.0.0)
gmp
hidapi
libev
libffi

|tezos-codec-----------------------------------|
/usr/local/bin/tezos-codec:
	/System/Library/Frameworks/Security.framework/Versions/A/Security (compatibility version 1.0.0, current version 59754.100.106)
	/usr/lib/libSystem.B.dylib (compatibility version 1.0.0, current version 1292.100.5)
	/usr/local/opt/hidapi/lib/libhidapi.0.dylib (compatibility version 0.0.0, current version 0.14.0)
	/usr/lib/libc++.1.dylib (compatibility version 1.0.0, current version 905.6.0)
	/usr/local/opt/gmp/lib/libgmpxx.4.dylib (compatibility version 11.0.0, current version 11.1.0)
	/usr/local/opt/gmp/lib/libgmp.10.dylib (compatibility version 15.0.0, current version 15.1.0)
	/usr/local/opt/libev/lib/libev.4.dylib (compatibility version 5.0.0, current version 5.0.0)
gmp
hidapi
libev
libffi


|tezos-baker-PtMumbai-----------------------------------|
/usr/local/bin/tezos-baker-PtMumbai:
	/System/Library/Frameworks/Security.framework/Versions/A/Security (compatibility version 1.0.0, current version 59754.100.106)
	/usr/lib/libSystem.B.dylib (compatibility version 1.0.0, current version 1292.100.5)
	/usr/local/opt/hidapi/lib/libhidapi.0.dylib (compatibility version 0.0.0, current version 0.14.0)
	/usr/lib/libc++.1.dylib (compatibility version 1.0.0, current version 905.6.0)
	/usr/local/opt/gmp/lib/libgmpxx.4.dylib (compatibility version 11.0.0, current version 11.1.0)
	/usr/local/opt/gmp/lib/libgmp.10.dylib (compatibility version 15.0.0, current version 15.1.0)
	/usr/local/opt/libev/lib/libev.4.dylib (compatibility version 5.0.0, current version 5.0.0)
gmp
hidapi
libev
libffi
tezos-sapling-params

|tezos-accuser-PtMumbai-----------------------------------|
/usr/local/bin/tezos-accuser-PtMumbai:
	/System/Library/Frameworks/Security.framework/Versions/A/Security (compatibility version 1.0.0, current version 59754.100.106)
	/usr/lib/libSystem.B.dylib (compatibility version 1.0.0, current version 1292.100.5)
	/usr/local/opt/hidapi/lib/libhidapi.0.dylib (compatibility version 0.0.0, current version 0.14.0)
	/usr/lib/libc++.1.dylib (compatibility version 1.0.0, current version 905.6.0)
	/usr/local/opt/gmp/lib/libgmpxx.4.dylib (compatibility version 11.0.0, current version 11.1.0)
	/usr/local/opt/gmp/lib/libgmp.10.dylib (compatibility version 15.0.0, current version 15.1.0)
	/usr/local/opt/libev/lib/libev.4.dylib (compatibility version 5.0.0, current version 5.0.0)
gmp
hidapi
libev
libffi

|tezos-smart-rollup-client-PtMumbai-----------------------------------|
/usr/local/bin/tezos-smart-rollup-client-PtMumbai:
	/System/Library/Frameworks/Security.framework/Versions/A/Security (compatibility version 1.0.0, current version 59754.100.106)
	/usr/lib/libSystem.B.dylib (compatibility version 1.0.0, current version 1292.100.5)
	/usr/lib/libz.1.dylib (compatibility version 1.0.0, current version 1.2.11)
	/usr/local/opt/hidapi/lib/libhidapi.0.dylib (compatibility version 0.0.0, current version 0.14.0)
	/usr/lib/libc++.1.dylib (compatibility version 1.0.0, current version 905.6.0)
	/usr/local/opt/gmp/lib/libgmpxx.4.dylib (compatibility version 11.0.0, current version 11.1.0)
	/usr/local/opt/gmp/lib/libgmp.10.dylib (compatibility version 15.0.0, current version 15.1.0)
	/usr/local/opt/libev/lib/libev.4.dylib (compatibility version 5.0.0, current version 5.0.0)
gmp
hidapi
libev
libffi
tezos-sapling-params

|tezos-smart-rollup-node-PtMumbai-----------------------------------|
/usr/local/bin/tezos-smart-rollup-node-PtMumbai:
	/System/Library/Frameworks/Security.framework/Versions/A/Security (compatibility version 1.0.0, current version 59754.100.106)
	/usr/lib/libSystem.B.dylib (compatibility version 1.0.0, current version 1292.100.5)
	/usr/local/opt/libffi/lib/libffi.8.dylib (compatibility version 10.0.0, current version 10.2.0)
	/usr/lib/libz.1.dylib (compatibility version 1.0.0, current version 1.2.11)
	/usr/local/opt/hidapi/lib/libhidapi.0.dylib (compatibility version 0.0.0, current version 0.14.0)
	/usr/lib/libc++.1.dylib (compatibility version 1.0.0, current version 905.6.0)
	/usr/local/opt/gmp/lib/libgmpxx.4.dylib (compatibility version 11.0.0, current version 11.1.0)
	/usr/local/opt/gmp/lib/libgmp.10.dylib (compatibility version 15.0.0, current version 15.1.0)
	/usr/local/opt/libev/lib/libev.4.dylib (compatibility version 5.0.0, current version 5.0.0)
gmp
hidapi
libev
libffi
tezos-sapling-params

|tezos-baker-PtNairob-----------------------------------|
/usr/local/bin/tezos-baker-PtNairob:
	/System/Library/Frameworks/Security.framework/Versions/A/Security (compatibility version 1.0.0, current version 59754.100.106)
	/usr/lib/libSystem.B.dylib (compatibility version 1.0.0, current version 1292.100.5)
	/usr/local/opt/hidapi/lib/libhidapi.0.dylib (compatibility version 0.0.0, current version 0.14.0)
	/usr/lib/libc++.1.dylib (compatibility version 1.0.0, current version 905.6.0)
	/usr/local/opt/gmp/lib/libgmpxx.4.dylib (compatibility version 11.0.0, current version 11.1.0)
	/usr/local/opt/gmp/lib/libgmp.10.dylib (compatibility version 15.0.0, current version 15.1.0)
	/usr/local/opt/libev/lib/libev.4.dylib (compatibility version 5.0.0, current version 5.0.0)
gmp
hidapi
libev
libffi
tezos-sapling-params

|tezos-accuser-PtNairob-----------------------------------|
/usr/local/bin/tezos-accuser-PtNairob:
	/System/Library/Frameworks/Security.framework/Versions/A/Security (compatibility version 1.0.0, current version 59754.100.106)
	/usr/lib/libSystem.B.dylib (compatibility version 1.0.0, current version 1292.100.5)
	/usr/local/opt/hidapi/lib/libhidapi.0.dylib (compatibility version 0.0.0, current version 0.14.0)
	/usr/lib/libc++.1.dylib (compatibility version 1.0.0, current version 905.6.0)
	/usr/local/opt/gmp/lib/libgmpxx.4.dylib (compatibility version 11.0.0, current version 11.1.0)
	/usr/local/opt/gmp/lib/libgmp.10.dylib (compatibility version 15.0.0, current version 15.1.0)
	/usr/local/opt/libev/lib/libev.4.dylib (compatibility version 5.0.0, current version 5.0.0)
gmp
hidapi
libev
libffi

|tezos-smart-rollup-client-PtNairob-----------------------------------|
/usr/local/bin/tezos-smart-rollup-client-PtNairob:
	/System/Library/Frameworks/Security.framework/Versions/A/Security (compatibility version 1.0.0, current version 59754.100.106)
	/usr/lib/libSystem.B.dylib (compatibility version 1.0.0, current version 1292.100.5)
	/usr/lib/libz.1.dylib (compatibility version 1.0.0, current version 1.2.11)
	/usr/local/opt/hidapi/lib/libhidapi.0.dylib (compatibility version 0.0.0, current version 0.14.0)
	/usr/lib/libc++.1.dylib (compatibility version 1.0.0, current version 905.6.0)
	/usr/local/opt/gmp/lib/libgmpxx.4.dylib (compatibility version 11.0.0, current version 11.1.0)
	/usr/local/opt/gmp/lib/libgmp.10.dylib (compatibility version 15.0.0, current version 15.1.0)
	/usr/local/opt/libev/lib/libev.4.dylib (compatibility version 5.0.0, current version 5.0.0)
gmp
hidapi
libev
libffi
tezos-sapling-params

|tezos-smart-rollup-node-PtNairob-----------------------------------|
/usr/local/bin/tezos-smart-rollup-node-PtNairob:
	/System/Library/Frameworks/Security.framework/Versions/A/Security (compatibility version 1.0.0, current version 59754.100.106)
	/usr/lib/libSystem.B.dylib (compatibility version 1.0.0, current version 1292.100.5)
	/usr/local/opt/libffi/lib/libffi.8.dylib (compatibility version 10.0.0, current version 10.2.0)
	/usr/lib/libz.1.dylib (compatibility version 1.0.0, current version 1.2.11)
	/usr/local/opt/hidapi/lib/libhidapi.0.dylib (compatibility version 0.0.0, current version 0.14.0)
	/usr/lib/libc++.1.dylib (compatibility version 1.0.0, current version 905.6.0)
	/usr/local/opt/gmp/lib/libgmpxx.4.dylib (compatibility version 11.0.0, current version 11.1.0)
	/usr/local/opt/gmp/lib/libgmp.10.dylib (compatibility version 15.0.0, current version 15.1.0)
	/usr/local/opt/libev/lib/libev.4.dylib (compatibility version 5.0.0, current version 5.0.0)
gmp
hidapi
libev
libffi
tezos-sapling-params

@PruStephan
Copy link
Contributor Author

@rvem can you approve that check is done correctly, and if so, I will remove all unnecessary for this issue changes?

@rvem
Copy link
Member

rvem commented Aug 16, 2023

Seems that only binary that requires fixing is tezos-client.

|tezos-accuser-PtMumbai-----------------------------------|
/usr/local/bin/tezos-accuser-PtMumbai:
	/System/Library/Frameworks/Security.framework/Versions/A/Security (compatibility version 1.0.0, current version 59754.100.106)
	/usr/lib/libSystem.B.dylib (compatibility version 1.0.0, current version 1292.100.5)
	/usr/local/opt/hidapi/lib/libhidapi.0.dylib (compatibility version 0.0.0, current version 0.14.0)
	/usr/lib/libc++.1.dylib (compatibility version 1.0.0, current version 905.6.0)
	/usr/local/opt/gmp/lib/libgmpxx.4.dylib (compatibility version 11.0.0, current version 11.1.0)
	/usr/local/opt/gmp/lib/libgmp.10.dylib (compatibility version 15.0.0, current version 15.1.0)
	/usr/local/opt/libev/lib/libev.4.dylib (compatibility version 5.0.0, current version 5.0.0)
gmp
hidapi
libev
libffi

libffi is listed, but not linked. AFAICS, libffi is redundant for all formulae except tezos-smart-rollup-node-PtMumbai and tezos-smart-rollup-node-PtNairob

@PruStephan PruStephan force-pushed the PruStephan/Remove_unnecessary_tezos_client_deps branch 2 times, most recently from 6cd637f to 9fa01a6 Compare August 22, 2023 08:50
rvem
rvem reviewed Aug 22, 2023
View reviewed changes
scripts/print-bottles-deps.py Outdated
import sys

binaries = [
"tezos-client",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

v18.0-rc1 introduced new *-dac binaries with the corresponding formulae. Could you please check them as well?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure, I will as soon as v18.0 is published

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

v18.0-rc1 and corresponding formulae are already published, btw

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems that dac files also have libffi dependency which they actually do not use. I will remove the dependency now. Do you want to check anything else here, @rvem

@PruStephan PruStephan force-pushed the PruStephan/Remove_unnecessary_tezos_client_deps branch 2 times, most recently from d710e0f to 80a410f Compare September 3, 2023 13:57
@PruStephan
Copy link
Contributor Author

tezos-dac-* files dependencies:

|-----------------------------------tezos-dac-client-----------------------------------|
/usr/local/bin/tezos-dac-client:
	/System/Library/Frameworks/Security.framework/Versions/A/Security (compatibility version 1.0.0, current version 59754.100.106)
	/usr/lib/libSystem.B.dylib (compatibility version 1.0.0, current version 1292.100.5)
	/usr/local/opt/hidapi/lib/libhidapi.0.dylib (compatibility version 0.0.0, current version 0.14.0)
	/usr/lib/libc++.1.dylib (compatibility version 1.0.0, current version 905.6.0)
	/usr/local/opt/gmp/lib/libgmpxx.4.dylib (compatibility version 11.0.0, current version 11.1.0)
	/usr/local/opt/gmp/lib/libgmp.10.dylib (compatibility version 15.0.0, current version 15.1.0)
	/usr/local/opt/libev/lib/libev.4.dylib (compatibility version 5.0.0, current version 5.0.0)
gmp
hidapi
libev
libffi
tezos-sapling-params
|------------------------------------------------------------------------------|
|-----------------------------------tezos-dac-node-----------------------------------|
/usr/local/bin/tezos-dac-node:
	/System/Library/Frameworks/Security.framework/Versions/A/Security (compatibility version 1.0.0, current version 59754.100.106)
	/usr/lib/libSystem.B.dylib (compatibility version 1.0.0, current version 1292.100.5)
	/usr/local/opt/hidapi/lib/libhidapi.0.dylib (compatibility version 0.0.0, current version 0.14.0)
	/usr/lib/libc++.1.dylib (compatibility version 1.0.0, current version 905.6.0)
	/usr/local/opt/gmp/lib/libgmpxx.4.dylib (compatibility version 11.0.0, current version 11.1.0)
	/usr/local/opt/gmp/lib/libgmp.10.dylib (compatibility version 15.0.0, current version 15.1.0)
	/usr/local/opt/libev/lib/libev.4.dylib (compatibility version 5.0.0, current version 5.0.0)
gmp
hidapi
libev
libffi
tezos-sapling-params
|------------------------------------------------------------------------------|

@PruStephan PruStephan force-pushed the PruStephan/Remove_unnecessary_tezos_client_deps branch from 68c9c71 to 224e804 Compare September 6, 2023 19:35
@PruStephan PruStephan enabled auto-merge September 6, 2023 19:53
@PruStephan PruStephan disabled auto-merge September 6, 2023 19:54
@PruStephan
[#591] Remove unnecessary dependencies from tezos binaries
effcf5e 
Problem: Many tezos binaries have a libffi dependency which it actually does not use. It needs to be removed

Solution: Removed unnecessary dependencies, check that bottles build without it
@PruStephan PruStephan force-pushed the PruStephan/Remove_unnecessary_tezos_client_deps branch from 224e804 to effcf5e Compare September 6, 2023 19:54
@PruStephan PruStephan merged commit 358f802 into master Sep 6, 2023
@PruStephan PruStephan deleted the PruStephan/Remove_unnecessary_tezos_client_deps branch September 6, 2023 20:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rvem rvem rvem approved these changes

Assignees

@PruStephan PruStephan

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Check brew formulae runtime dependencies
2 participants
@PruStephan @rvem